summaryrefslogtreecommitdiffstats
path: root/SetFlags.cmake
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-23 00:36:13 +0200
committerarchshift <admin@archshift.com>2014-07-24 20:21:37 +0200
commit4191be7ddba820af4ed0c505a8d62416c2b7a8b4 (patch)
tree23d92e889d345d33e302aeb5e699fb92bbadc04b /SetFlags.cmake
parentAdded a queue for setting chunk data. (diff)
downloadcuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.tar
cuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.tar.gz
cuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.tar.bz2
cuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.tar.lz
cuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.tar.xz
cuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.tar.zst
cuberite-4191be7ddba820af4ed0c505a8d62416c2b7a8b4.zip
Diffstat (limited to 'SetFlags.cmake')
-rw-r--r--SetFlags.cmake14
1 files changed, 7 insertions, 7 deletions
diff --git a/SetFlags.cmake b/SetFlags.cmake
index bf467ca01..cf8082503 100644
--- a/SetFlags.cmake
+++ b/SetFlags.cmake
@@ -28,7 +28,7 @@ endmacro()
macro(set_flags)
# Add coverage processing, if requested:
if (NOT MSVC)
-
+
if (CMAKE_BUILD_TYPE STREQUAL "COVERAGE")
message("Including CodeCoverage")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/lib/cmake-coverage/")
@@ -85,7 +85,7 @@ macro(set_flags)
# We use a signed char (fixes #640 on RasPi)
add_flags_cxx("-fsigned-char")
-
+
endif()
@@ -202,7 +202,7 @@ macro(enable_profile)
set(CMAKE_CONFIGURATION_TYPES "Debug;Release;DebugProfile;ReleaseProfile;Coverage" CACHE STRING "" FORCE)
endif()
endmacro()
-
+
macro(set_exe_flags)
# Remove disabling the maximum warning level:
# clang does not like a command line that reads -Wall -Wextra -w -Wall -Wextra and does not output any warnings
@@ -216,22 +216,22 @@ macro(set_exe_flags)
string(REPLACE "-w" "" CMAKE_CXX_FLAGS_COVERAGE "${CMAKE_CXX_FLAGS_COVERAGE}")
string(REPLACE "-w" "" CMAKE_C_FLAGS_COVERAGE "${CMAKE_C_FLAGS_COVERAGE}")
add_flags_cxx("-Wall -Wextra -Wno-unused-parameter -Wno-error=switch")
-
+
# we support non-IEEE 754 fpus so can make no guarentees about error
add_flags_cxx("-ffast-math")
-
+
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# clang does not provide the __extern_always_inline macro and a part of libm depends on this when using fast-math
add_flags_cxx("-D__extern_always_inline=inline")
add_flags_cxx("-Werror -Weverything -Wno-c++98-compat-pedantic -Wno-string-conversion")
- add_flags_cxx("-Wno-extra-semi -Wno-error=switch-enum -Wno-documentation")
+ add_flags_cxx("-Wno-error=switch-enum -Wno-documentation -Wno-exit-time-destructors")
add_flags_cxx("-Wno-error=sign-conversion -Wno-error=conversion -Wno-padded")
add_flags_cxx("-Wno-error=deprecated -Wno-error=weak-vtables -Wno-error=float-equal")
add_flags_cxx("-Wno-error=missing-prototypes -Wno-error=non-virtual-dtor")
add_flags_cxx("-Wno-error=covered-switch-default -Wno-error=shadow")
add_flags_cxx("-Wno-error=exit-time-destructors -Wno-error=missing-variable-declarations")
add_flags_cxx("-Wno-error=global-constructors -Wno-implicit-fallthrough")
- add_flags_cxx("-Wno-weak-vtables -Wno-switch-enum -Wno-exit-time-destructors")
+ add_flags_cxx("-Wno-weak-vtables -Wno-switch-enum")
endif()
endif()